Merge git://www.denx.de/git/u-boot-imx
authorTom Rini <[email protected]>
Wed, 20 Sep 2017 16:32:34 +0000 (12:32 -0400)
committerTom Rini <[email protected]>
Wed, 20 Sep 2017 16:32:34 +0000 (12:32 -0400)

Trivial merge